class management improved