Making sure everything is matching part 2