more pubsub changes