converted more models to INPC TP