C2: added diagnostics