updated to fit new class rules