merged 2 files from xnta