Making sure all works for presentation