desktop paths still being retained
Merge branch 'master' into working
posterior changes for test run