updated to use new plugin methods