Updating changes and doc