Updated content and organization