Updating this plugin to fix some bugs