added changes from Bernard's final comments