JC: changed some msg. more CN.