more timing improvements