Added logic for comments