updated for header and footer