Updated to be more like work-desktop