Add switch cell, correct cell generation
Add switch cell, correct cell generation