Let's try this again - added all header translation stuff