Improved rip_client