update s2.scala