comma
consolidate live feed logic