Added Interval timer, removed bugged state restoration