one step closer proper header/body structure