Lots of changes for analysis of  behavior/sniffing.