refactor DUB build