Manually merged xpAPI