more timing modifications