added state info to server/client sides