changed some timing