Improve Timer

Improve Timer