Making sure we cover all bases