merge pick's new changes