Update to use also BM_update from ywesee