redo some changes I lost in azure