Updated client and server with his examples