TESTED FOR THE DESKTOP CLIENT