updated to new plugin style