fix duel
Merge branch 'xstools'