WIP, refine header