switched from problematic TP modeling to SRP