Updated client and server scripts