big changes in client and server