Reworking the plugin.