Improve world demo