Many BS3 changes.