updated to new use plugin structure
uses new plugin model