Need to improve more in location infrastructure