updated for new plugins