Updated timekeeping