Use locks (16/30)

Use locks