On-Demand, Just in Time!