additions for header ordering fix.