Adjusts @k88hudson's notes from PR 793