fixing timing issues
fixing timing issues