Implement perfect header copy + simplify