add clusters & refactor zombies