small class changes