simplified for new plugin version