ARC-ify
ARC-ify some more