changes for mass_virtual etc