changed the way the cell iterator works;