Updated to work with latest RDev