Updated header AND main