Switched to lists from explicit tuples