Added Shan's Client