Changed set-up commands to ensure all game elements are in the same world.