CHAN - more comments & some restructurization