fixed the s1 and s2. r1 and r2 left to fix