Refactored Fold, again...