Updated to work with the latest octrees.