hammerhead: update from CM