added if condition for comments