Added quick and dirty diagnostics