modifications to use new class hierarchy