changes to build up tuples