updated resolution of system diag
merge