Small edits with 2 Base classes