Improved reporting tool script