changes from Bernard's comments