Rework 'shared' cell logic