added comment and discussion class