Updating to the latest changes