Updated for ARC and storyboarding.