class changes, etc