updated for n-tuple expressions