Some new diagnostics - bench chart needs fixing