Fix stochastic rule, update tree to new structure