Improve diagnosis and recover data funcs