diagnostic routines updated

diagnostic routines updated