changed design and changed to bs2