TODO: Merge TPT Github with repo

merge the latest changes in tpt repo with ours