Added the possibility a variable target can be a grid cell.