updated for new app changes with plugin disabling