updated for bs3