Updated sniffer. Works from 5.2.x - 5.3.x