updated from TH2