partially added comment functionality