Overtime fix/improvment + added new message