wrong calculation for the timer, now fixed
added new fix