Improved BM locking.