Refactor new_cells