Re-work body and Header handling