Updates to work with special header (rather than header-3av)