Updated for ARC.