more user class changes