locking mechanism improvements