JC: more CN. refecotring fields name.
JC: more CN.