Final commit, submitted to the AppStore