Updated client and tools