adjusted some timing