BSW changes