Added client->server flow
fixed formatting issues