Updated with new plugin