Updated tupsupport