PR has been updated with these changes.