more timing tweaking