#136 changed lock mechanism