updated for bs 3.1.1