Changes to ParseXYZ