Added client portion