65621cc6baba4

Rewriting some code in plugin…