Refactored Pattern Matching on New Ride