Use locks (7/30)

Use locks