headers structure changed; content correction