finalised new class structure