finished some timing issues