Use locks (18/30)

Use locks