server - client modifications