Update to this design

Update to this design based on comments at last TSC and recent code change made in #9467