The return of the plugin

Agreed and done.