Changes to SetSpawn