JC: more CN. minor change in views.