Use locks (13/30)

Use locks