working from desktop. still buggy from workspace