adapated for converted tuples v7