Draft of changes to credit Samuel Hinz properly for his contribution.