modified comment logic