merge new header

with some fixes