comment logic - major change