Add call to gather comment data
Merge with Dang's code