updated for rc-7