Updated for iOS7 and ARC