Lock Changes and Upgrades in BD16