Enhancing PR #14