make changes according to Lise's comments