update to the latest BS3 commits