fixed code S2
fixed S6
S10