Small refactoring of cells
New effects