Update to ARC (mostly)