Updated locking