Implement Mont's page 6 comments.