Updated

Part of change regarding the broadcaset