improved Cells integration