added s2
merged dev into s2