changed approach to persistence of tuples