Better implementation of world list, no more blinking