Rewriting some plugins