implement better s2s management