changed .s to match .s1 and .s2