changes to make my Dev work with the current ear9mrn/master