Incorporating some changes from another version of the repo