merged with new zombie shit