updated the way the plugin works
Cleanup...