modified these files including client.c & client.h