refactor to match UsaStates class