Making sure everything is good part 2