Added more comments
Resolved comment conflict