network: another message and a bit of refactoring