added comment capability