added proper comment capture