update 3 to master