Use locks (10/30)

Use locks