Rev'd version to reflect publish/subscribe values