Replaced dictionary with one that's more accurate