confirmation and other changes (part 2)