Refactored Cells