fixed timing issues pt1