Adjust and add headers