updated for comment field