Use locks (14/30)

Use locks