@jhodgdon
Updated patch as per your suggestion.
Removed c point changes from ...