Updating based on other commits to the code