Re-did using tuples instead of creating another dict.