improved Desktop Client