Changed initial check to use SpawnManager