Improved "locking" Functioning