Modify S8 and S2