added comment fields