Use a dictionary if necessary (29/48)

Use a dictionary if necessary