small changes to S2