Incorporated feedback from maintainer