logic change - added tuples
delete old clunky lists