client server modifications