Changing automatically the end time (TEAM-83)