Adding more tools
merged with ginos code