More State Changes

better organized state changes.