Improve spawning