put headers where they should belong to