Added witch/giant spawning