Appropriately re-engineer virtual?