edited desktop client source