updated content and new structure