small changes for new class