Making TPT faster