Solved header issues