removed DeviceLocation
and replaced it with ILocation