Use locks (12/30)

Use locks