added Diagnose option