Added troubleshoot