Final commit for this sample code