More works on SERVER/CLIENT