reverted back to plugin
merging