Trying to fix the brodcast stuff