changed world-switch mechanics