Updated for iOS7 and new ARC