Updated per Issue #2