changes from desktop
merging desktop and laptop changes