The return of the plugin

Done, also in the comment.