patch from erlehmann and new ANIMAL-mode