tree based rework (tweak)