Updated yet again for azure