Adding more troubleshooting