Much more robust networking