Changed new timer code to be correct.