improved the entire header