Make safe (20/36)

Make safe