Updating to rc-2