changes from the desktop not sure how this is different from the laptop version but fuck it save it
merging changes from laptop to desktop