Working on the plugin ....