Improved troubleshooter