header and structure changes