Substantial changes to hfbsm