added location and cells