Re-design the output of the rs_client