Adding diagnostics...