Updated to latest xtag