Effectively I've rewritten the plugin