Making slight changes to get the plugin working again.