Merge some new changes