Even more universal now! And fix for zombie target