#787, and some bs3 code