restrict, project and add-to use real tuple functions now