Update to RDO class