more class changes...