Some  updates to the spawning