some class changes