Use locks (23/30)

Use locks