Added the 'sniff' mechanism!