B - Update listeners

TODO: write this after webhooks PR is merged.