update to 3 in master branch