some changes off azure
Merging from android