started complete rework of the plugin