Changes to address and header content