Added CLIENT and SERVER