Modify for On Demand Viewing