improved locking mechanism