updated model
Merge branch 'geolocation'

need to merge it