Added back in timing code by default