Update to read from options correctly (Cells incompat)