Modified more code to use new tuples