Changed macros definition for cnote