corrected timing issues