Improve s1 and s2