changed models to add lat and long
merge conflict