Updated server and fixed repsonses