updated for BMS changes