Header refinement

by Andy Smart