better broadcast handling