Improving TP1-app1