Adding the working desktop version