Update to RCv2 only