improve the plugin