Major update regarding locking