modified Server