Tuple definitions corrected