Edits in response to BBG second comments