BS improvement

Main - BS improvement