Replaced header with a much simpler design