No real changes other than commenting out NSLogs.