We only need to fix the s1 s2 things in last case

Yea!