Adjustments to get it spawning correctly