Fixed and updated Timers within States