Design revisions from 6/15