Made spawning better