Included comments from Jerome