merged changes from cocker-spanielv2 (Chezy Champs working code)