Revamped the plugin.