need to fix pubsub