Refactored downpour