Re added changes to State.rb/