more class improvement work