Starting to improve the location model.