need to fix new class