merged with Suchandra's updates of TTI_61X_TPObjects_v7