Done the same for MM headers