#9 mubsub rewrite