Fixed server and modified client