On-Demand - retrofit