tree update WIP2