Fixed the state issue (Timer.cs to be removed)