Added some SoP and PS