timing fixes
timing fixes