added new context and headers for remaining sections