Including Content and minor header changes