Improving world selector