more class updates (no testing yet)