changed s2s1 conditional for plotting