Updated locking mechanism