re-factor apply logic for UG deliveries