Updated commented headers