add most recent changes to bms repo