Use locks (24/30)

Use locks