Refactored the Broadcast Feeds