timing mostly fixed!