Adapting the new header