addressed andre's comments