Merged 2 plugins