Added more header comments