fixed tup stuff