App updated up to step 6.13 with a little bit of polishing to avoid cancelling saveChanges twice.