Refactored world.