comment all code
support 're-run' from incomplete tree model (in failure case)
refactor code