Totaly recoded plugin.