Refactored Fold