Began merging sniffer with agent