added #header and #name again, don't know where they went