Some last minute changes s1 & s2