Implemented new states in getState of course