add tuples - this really simplified the code