upgrade to BS3