updated with new plugins
merge conflict