Responded to Andres, and also added new header