refactor duel tag a bit