XYZ changes and updates to submodule