updating SS from upstream