Adjusted origin & destination variables

Adjusted origin & destination variables for future looping adjustments..