Little bit more source headers alteration