C2: added diagnostic messages