Pushed BSO changes