updates to stateclass & toggleactive