added safe default cases in case a new State is added