Moved on to the state manager