Added option to disable broadcasting