cleaned plugin to be mroe pluginiss