broadcast logic improved