Fix bug with devices && added DeathZone component