First pass at BM Specific mods