server and json changes