Change to use M::B instead of M::I