Order Supply - To address misc changes