Use locks (22/30)

Use locks