Change only on desktop
Merged the two changes