I have cleaned the code and completely revamped the plugin