Are there any changes to be made per this comment, or shall we merge as-is now?