updated roundtripping for ps-po