I watched the extended cut and created the identical buttons and code.  When in edit mode, I can edit all fields in both the form and subform as expected and as shown in the free video.  But, if I edit something in the main form, then edit something in the subform, the main form is saved (ie no longer dirty, no more pencil icon), This makes the "undo" code in the Cancel button not undo anything when the Cancel button is clicked.  Also, if I only edit something in the subform (it becomes dirty with the pencil icon), then when I click on the Cancel button (in the main form), the subform becomes saved (no longer dirty) by the act of essentially moving focus to a control on the main form (the Cancel button).  Am I missing something?