Fixed Zordering and collisions with trees
merge