[Final] [Javi] Timer fixes