JC: more CN. minor change on views.