Added zach's PR #80