Worked more on spawner logic