Final touches on header v1