Changed back the stateVar ids.