working on adding location information