Zombie behavior enhanced.
Refactor