more timing edits