Revert "pso"

This reverts commit cae30f2e9b6676ffb44f1d7d18227c2f4518d73a.
Revert "Revert "pso""

This reverts commit 33aa708f59eeaa981ddb3e2ef950b485e9180e3d.
Tsp PSO