Feature/zombie 0825