Some more changes to S2P