Updated for pundit troubleshooting