changes in header + random stuff