Minor changes that I reverted to the repo's version