updates to new class