Updated version for submission to App Store.