reorder bms, put on separate lines for VCS happiness