updated new class skeleton