changes for BSW and BGW