Client changes to server

Vice versa of the last push.