Further draft based on design decision; edits