[WIP] Updating function take RDV