Full refactoring with tcpdump