Uses the dictionary now