preparing new version to add the header groups back