initial changes to integrate bs3.0