Merging some changese from desktop