changes to Client and Server functions on Tuesday