tweaking locking feature