Updated for new comments and name