Refactor SUBHEAD continued