Updated for BM 4.1