First pass edit to PubSub