Polishing of cell state handling