Update with RFC #52