small change to pubsub and moving over to amd