Added new tools, added extra func to existing tools.