some changes after merge