updated support for mobile and desktop