more HSoM changes