changed Server code2