Cleaned up PR #90