Elana's latest changes to pubsub