partial update of s1 to the new code world