Fixed server. Added client