Merging some changes