swapped cells and cells.c again