up to bs3, closes #2