Corrected Client and broadcast