added comment switch