ammend s2s links, close when done not immediate