Modifications to p5, still in progress - segregated s and n operations