change 'header only' to normal & move from hotfix