added option to disable the locking/unlocking feature