Updated header and tags