xdi2 version updated to support notation shift.