Overtime fix view 1