Changed dict to tuples