Auto lock feature

Auto lock feature