Added comment logic