Improves timer
Fixes merge