             var error: Error?
             
             do {
-                try s.eventStore.saveCalendar(calendar, commit: true)
+                try s.eventStore.saveCalendar(calendar, commit: s.isCommitted)
                 success = true
             } catch let e {
                 error = e

            }
            
            do {
                try s.eventStore.remove(reminder, commit: true)
                success = true
            } catch let e {
                error = e

            var error: Error?
            
            do {
                try s.eventStore.save(reminder, commit: s.isCommitted)
                success = true
            } catch let e {
                error = e
