Increment ; add Query criteria
Conditional can be removed