refactor old header