FYI-- The above four lines are the new code for this pull request.  The diff below is just whitespace indentation for the additional nesting.