added support for bs2 & bs3