first pass of s2s changes