Plugins improved
merge