Revised designs to include self diagnostics