add diagnostic tools