class rework