tweaks to fit changes to parent class