final changes duel assignment part 1