Rewritten entirely the plugin !