Edits from Bernard