Change measurements/, make data pull work for map