JC: more CN. refectoring index view.