added diagnostics.