changes on header and structure redone