Removed unnecessary class dependency. Tweaked the timer