updated for latest plugin changes