updated to match diagram in mdxml
revised for consistency
new
revised for consistency - tweaks in response to xsl check