timing fixes?