Updates to location logic