Update with comments from Frank