Updated with comments from comprehensive edit.