Improved World::draw