Added SERVER and CLIENT