changes to make it work in Azure