More updated for world