New timing and tidy up (still in progress)