removed s2p