Update to reflect RD changes