More work done on the diagnostic package