added in diagnostics