Improving SW for BS version