more class updates