Upgraded timer from timer:master