changes done for desktop
Merge branch 'NewBranch'
building