Code redesign
Fix timer not reseting