Commit 7 - Fixed basic timer issue