deal with new trinity headers