Updated locations and map