Addressing the commit issues of the previous pull request