More changes for cross3d.