Addressed review comments from Jacques