added comment type switching