Updated header copying