Use locks (5/30)

Use locks