Added wrapping segments to S & SA.