added new logic to comment field