change next state class determining
support choosing fix