Added some very promissing code to fix the timer issue.
Fixed timer.