Working to add desktop compatibility