refactored BS containers