Moved new plugin into this one