Updating the branch 3.0