Merge with xnta