merging some changes