beginning upgrade to bs3