Integrating enhancement proposal from gh-1