Use locks (25/30)

Use locks