Improve TPS to be undisputably correct