Rewriting some code in plugin…