Corrected and completed the tool for friends