The return of the plugin

As discussed, done.