Use a dictionary if necessary (28/48)

Use a dictionary if necessary