updates to reflect new class structures