made location searcing & storing more efficient