Added states, however, with a CSSO bug appeared