Will scheme change to protect Lock