Update and rename clock to time2