JC: refectoring views. More CN.