the explicit tree wasn't working out, so I'm reverting to how it used to be