Final Updates to Code for Azure