Add Client, Fix server