Changes for submission to app store