Updated Desktop implementation