reworked for new class names