Added cat detection...