Making BM work appropriate.

Making BM work appropriate.