Updated Wave-Spawning System