Adding troubleshooting