changes to header and type