Moved back deafult implementation of states
Renamed default state