Replaced some headers