Setting up for merge with RI