Updated tool to add alot more values