Update to latest BS3