added location fields