and more bem refactor